From: Andrew Cooper <andrew.cooper3@citrix.com>
Date: Mon, 29 Sep 2014 08:23:48 +0000 (+0200)
Subject: x86/svm: misc cleanup
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~4303
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/cgi/%22https:/%22bookmarks://%22/%22http:/www.example.com/cgi/%22https:/%22bookmarks:/%22?a=commitdiff_plain;h=5dde73346f99f99397b1977ef9555e3592e9d71b;p=xen.git

x86/svm: misc cleanup

cpu_has_monitor_trap_flag is a VMX control, and has nothing to do with SVM.

Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
---

diff --git a/xen/arch/x86/hvm/svm/svm.c b/xen/arch/x86/hvm/svm/svm.c
index cda968bd8e..e3e15655c5 100644
--- a/xen/arch/x86/hvm/svm/svm.c
+++ b/xen/arch/x86/hvm/svm/svm.c
@@ -1187,8 +1187,6 @@ static void svm_inject_trap(struct hvm_trap *trap)
             __restore_debug_registers(vmcb, curr);
             vmcb_set_dr6(vmcb, vmcb_get_dr6(vmcb) | 0x4000);
         }
-        if ( cpu_has_monitor_trap_flag )
-            break;
         /* fall through */
     case TRAP_int3:
         if ( curr->domain->debugger_attached )